build dist for x86_64-pc-solaris and sparcv9-sun-solaris #138699

psumbera · 2025-03-19T10:23:21Z

Note that this needs Nix with following commit:
nix-rust/nix@0f45593
Unfortunatelly there is no new release.

And for sparcv9 it needs also:
libffi-rs/libffi-rs#103

For now it therefore uses cargo patch infrastructure for these.

try-job: dist-sparcv9-solaris
try-job: dist-x86_64-solaris
try-job: dist-various-2
try-job: dist-x86_64-illumos

rustbot · 2025-03-19T10:23:26Z

rustbot has assigned @marcoieni.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2025-03-19T10:23:28Z

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

src/tools/rust-analyzer/Cargo.toml

Cargo.toml

jieyouxu · 2025-03-20T04:08:34Z

(That being said, thank you for investigating fixes for the Solaris CI)

bors · 2025-04-15T08:56:07Z

☔ The latest upstream changes (presumably #139826) made this pull request unmergeable. Please resolve the merge conflicts.

marcoieni · 2025-04-16T13:40:17Z

Is this ready for review? 👀

src/tools/rust-analyzer/Cargo.lock

…cola update libc This is needed for rust-lang#138699 (comment)

Rollup merge of rust-lang#139969 - psumbera:libc-rust-analyzer, r=lnicola update libc This is needed for rust-lang#138699 (comment)

update libc This is needed for rust-lang/rust#138699 (comment)

marcoieni · 2025-04-22T09:50:16Z

src/ci/docker/scripts/solaris-toolchain.sh

+BINUTILS_URL="https://ftp.gnu.org/gnu/binutils/$BINUTILS_TAR"
+
+
+download_file() {


I saw this function is duplicated from illuminos-toolchain.sh
Can you move it to a shared script file or similar and source the file? so that we avoid having duplicate code.

Same is true for other parts of the scripts which are very similar

I saw this function is duplicated from illuminos-toolchain.sh Can you move it to a shared script file or similar and source the file? so that we avoid having duplicate code.

I have moved it into shared.sh.

Same is true for other parts of the scripts which are very similar

There are no other common functions. While the structure looks similiar I don't think it's good to connect these two more.

marcoieni · 2025-04-22T09:50:20Z

Sorry for the wait, I'm having a look now. I'm familiar with the Rust CI in general but not with solaris specifically, so please don't assume I'm familiar with the scripts you edited 👍

From what I can see you are extracting the build of x86_64-solaris and sparcv9-solaris from the dist-various-2 job.
My first question is: why? What's the advantage with respect to keeping these jobs in the dist-various-2 job?

The second question is: the dockerfile of dist-various-2 uses ubuntu:22.04. Why are you using ubuntu:18.04 for the new dockerfiles? Is it possible to use newer ubuntu images?
Same for older software like python2. Previously python2 wasn't needed in dist-various-2, why do we need it now?

Also can you explain how this PR fixes the issue you linked?

psumbera · 2025-04-24T07:26:08Z

From what I can see you are extracting the build of x86_64-solaris and sparcv9-solaris from the dist-various-2 job. My first question is: why? What's the advantage with respect to keeping these jobs in the dist-various-2 job?

dist-various-2 was generating just standard library for Solaris. Now also host tools are generated. So I think it's correct to move it outside of dist-various-2 job and have separate job like Illumos or BSDs.

The second question is: the dockerfile of dist-various-2 uses ubuntu:22.04. Why are you using ubuntu:18.04 for the new dockerfiles? Is it possible to use newer ubuntu images? Same for older software like python2. Previously python2 wasn't needed in dist-various-2, why do we need it now?

I have updated change to use ubuntu:22.04 and python3.

Also can you explain how this PR fixes the issue you linked?

I was asked in #126025 to do clean up. I decided to clean it up by compleltely removing all Solaris related stuff from dist-various-2 and have bright new build job for Solaris :-)

marcoieni

A few minor comments.
@Kobzol can you have a look at this PR as well?

src/ci/docker/host-x86_64/dist-sparcv9-solaris/Dockerfile

src/ci/docker/scripts/solaris-toolchain.sh

src/ci/github-actions/jobs.yml

src/ci/docker/scripts/solaris-toolchain.sh

…rcoieni Increase timeout for new bors try builds To sync it with [homu](https://github.com/rust-lang/homu/blob/master/cfg.production.toml#L34). Saw the timeout [here](rust-lang#138699 (comment)), it was set to only 4 hours for new bors. r? ``@marcoieni``

Rollup merge of #141771 - Kobzol:bors-increase-timeout, r=marcoieni Increase timeout for new bors try builds To sync it with [homu](https://github.com/rust-lang/homu/blob/master/cfg.production.toml#L34). Saw the timeout [here](#138699 (comment)), it was set to only 4 hours for new bors. r? ``@marcoieni``

Increase timeout for new bors try builds To sync it with [homu](https://github.com/rust-lang/homu/blob/master/cfg.production.toml#L34). Saw the timeout [here](rust-lang/rust#138699 (comment)), it was set to only 4 hours for new bors. r? ``@marcoieni``

psumbera · 2025-06-02T15:51:14Z

@bors2 try

rust-bors · 2025-06-02T15:51:16Z

@psumbera: 🔑 Insufficient privileges: not in try users

jieyouxu · 2025-06-02T15:59:31Z

@bors2 try

rust-bors · 2025-06-02T15:59:34Z

⌛ Trying commit 0f1579b with merge 1a278b8…

build dist for x86_64-pc-solaris and sparcv9-sun-solaris  FIx for #126025 Note that this needs Nix with following commit: nix-rust/nix@0f45593 Unfortunatelly there is no new release. And for sparcv9 it needs also: libffi-rs/libffi-rs#103 For now it therefore uses cargo patch infrastructure for these.  try-job: dist-sparcv9-solaris try-job: dist-x86_64-solaris

rust-bors · 2025-06-02T18:17:51Z

☀️ Try build successful (CI)
Build commit: 1a278b8 (1a278b8e761394e5409f5ebe9b4ab99f94cfcfb7)

marcoieni · 2025-06-03T09:27:14Z

This looks good. I'm trying the other jobs edited by this pr to make sure nothing broke and if the try jobs work I'll approve.

@bors2 try

rust-bors · 2025-06-03T09:27:17Z

⌛ Trying commit 0f1579b with merge da4fc05…

build dist for x86_64-pc-solaris and sparcv9-sun-solaris  FIx for #126025 Note that this needs Nix with following commit: nix-rust/nix@0f45593 Unfortunatelly there is no new release. And for sparcv9 it needs also: libffi-rs/libffi-rs#103 For now it therefore uses cargo patch infrastructure for these.  try-job: dist-sparcv9-solaris try-job: dist-x86_64-solaris try-job: dist-various-2 try-job: dist-x86_64-illumos

rust-bors · 2025-06-03T11:33:14Z

☀️ Try build successful (CI)
Build commit: da4fc05 (da4fc05f7b652b51d3bfdd1538406ad5a6204a7b)

marcoieni · 2025-06-03T14:31:09Z

@bors r+

bors · 2025-06-03T14:31:12Z

📌 Commit 0f1579b has been approved by marcoieni

It is now in the queue for this repository.

Rollup of 8 pull requests Successful merges: - #136687 (Improve the documentation of `Display` and `FromStr`, and their interactions) - #137306 (Remove `i128` and `u128` from `improper_ctypes_definitions`) - #138699 (build dist for x86_64-pc-solaris and sparcv9-sun-solaris) - #141250 (add s390x z17 target features) - #141467 (make `OsString::new` and `PathBuf::new` unstably const) - #141871 (index: add method for checking range on DenseBitSet) - #141888 (Use non-2015 edition paths in tests that do not test for their resolution) - #142000 (bootstrap: don't symlink source dir into stage0 sysroot) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #138699 - psumbera:solaris-ci-build3, r=marcoieni build dist for x86_64-pc-solaris and sparcv9-sun-solaris try-job: dist-sparcv9-solaris try-job: dist-x86_64-solaris try-job: dist-various-2 try-job: dist-x86_64-illumos

Rollup of 8 pull requests Successful merges: - rust-lang/rust#136687 (Improve the documentation of `Display` and `FromStr`, and their interactions) - rust-lang/rust#137306 (Remove `i128` and `u128` from `improper_ctypes_definitions`) - rust-lang/rust#138699 (build dist for x86_64-pc-solaris and sparcv9-sun-solaris) - rust-lang/rust#141250 (add s390x z17 target features) - rust-lang/rust#141467 (make `OsString::new` and `PathBuf::new` unstably const) - rust-lang/rust#141871 (index: add method for checking range on DenseBitSet) - rust-lang/rust#141888 (Use non-2015 edition paths in tests that do not test for their resolution) - rust-lang/rust#142000 (bootstrap: don't symlink source dir into stage0 sysroot) r? `@ghost` `@rustbot` modify labels: rollup

psumbera · 2025-06-06T07:19:11Z

Seems that only llvm-tools are newly delivered. Where are others?
https://rust-lang.github.io/rustup-components-history/x86_64-pc-solaris.html

nikic · 2025-06-06T07:33:02Z

@psumbera Missing changes to build-manifest: https://github.com/rust-lang/rust/blob/master/src/tools/build-manifest/src/main.rs

…oieni Add solaris targets to build-manifest this is follow up for: rust-lang#138699

Rollup merge of #142110 - psumbera:solaris-ci-build4, r=marcoieni Add solaris targets to build-manifest this is follow up for: #138699

rustbot assigned marcoieni Mar 19, 2025

Veykril reviewed Mar 19, 2025

View reviewed changes

src/tools/rust-analyzer/Cargo.toml Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

jieyouxu reviewed Mar 19, 2025

View reviewed changes

Cargo.toml Outdated Show resolved Hide resolved

psumbera force-pushed the solaris-ci-build3 branch from 3b9fbda to 0deec39 Compare March 19, 2025 11:00

This comment has been minimized.

Sign in to view

psumbera mentioned this pull request Mar 21, 2025

temporarily define O_DIRECT and SIGINFO for Solaris rust-lang/libc#4348

Merged

psumbera force-pushed the solaris-ci-build3 branch from 0deec39 to f556156 Compare April 16, 2025 10:15

Veykril reviewed Apr 16, 2025

View reviewed changes

src/tools/rust-analyzer/Cargo.lock Outdated Show resolved Hide resolved

psumbera mentioned this pull request Apr 17, 2025

update libc #139969

Merged

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 17, 2025

Rollup merge of rust-lang#139969 - psumbera:libc-rust-analyzer, r=lni…

4c92186

…cola update libc This is needed for rust-lang#138699 (comment)

rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 18, 2025

Unrolled build for rust-lang#139969

bb3671a

Rollup merge of rust-lang#139969 - psumbera:libc-rust-analyzer, r=lnicola update libc This is needed for rust-lang#138699 (comment)

github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Apr 18, 2025

Rollup merge of #139969 - psumbera:libc-rust-analyzer, r=lnicola

4021a34

update libc This is needed for rust-lang/rust#138699 (comment)

psumbera force-pushed the solaris-ci-build3 branch from f556156 to 7152b36 Compare April 18, 2025 05:49

github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Apr 19, 2025

Rollup merge of #139969 - psumbera:libc-rust-analyzer, r=lnicola

2806093

update libc This is needed for rust-lang/rust#138699 (comment)

jieyouxu removed the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Apr 22, 2025

marcoieni reviewed Apr 22, 2025

View reviewed changes

psumbera force-pushed the solaris-ci-build3 branch from 7152b36 to d5925a8 Compare April 24, 2025 07:10

marcoieni reviewed Apr 24, 2025

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 3, 2025

matthiaskrgr mentioned this pull request Jun 4, 2025

Rollup of 8 pull requests #142003

Merged

bors merged commit 8ae7ca0 into rust-lang:master Jun 4, 2025
9 checks passed

rustbot added this to the 1.89.0 milestone Jun 4, 2025

psumbera mentioned this pull request Jun 6, 2025

Add solaris targets to build-manifest #142110

Merged

jhpratt added a commit to jhpratt/rust that referenced this pull request Jun 7, 2025

Rollup merge of rust-lang#142110 - psumbera:solaris-ci-build4, r=marc…

8a9c710

…oieni Add solaris targets to build-manifest this is follow up for: rust-lang#138699

jhpratt added a commit to jhpratt/rust that referenced this pull request Jun 7, 2025

Rollup merge of rust-lang#142110 - psumbera:solaris-ci-build4, r=marc…

6b4abb9

…oieni Add solaris targets to build-manifest this is follow up for: rust-lang#138699

rust-timer added a commit that referenced this pull request Jun 7, 2025

Unrolled build for #142110

36571dd

Rollup merge of #142110 - psumbera:solaris-ci-build4, r=marcoieni Add solaris targets to build-manifest this is follow up for: #138699

psumbera mentioned this pull request Jun 9, 2025

add Solaris support rust-lang/rustup#4380

Merged

		BINUTILS_URL="https://ftp.gnu.org/gnu/binutils/$BINUTILS_TAR"


		download_file() {

build dist for x86_64-pc-solaris and sparcv9-sun-solaris #138699

build dist for x86_64-pc-solaris and sparcv9-sun-solaris #138699

Uh oh!

Conversation

psumbera commented Mar 19, 2025 • edited by marcoieni Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Mar 19, 2025

Uh oh!

rustbot commented Mar 19, 2025

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

This comment has been minimized.

jieyouxu commented Mar 20, 2025

Uh oh!

bors commented Apr 15, 2025

Uh oh!

marcoieni commented Apr 16, 2025

Uh oh!

Uh oh!

marcoieni Apr 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

psumbera Apr 24, 2025

Choose a reason for hiding this comment

Uh oh!

marcoieni commented Apr 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

psumbera commented Apr 24, 2025

Uh oh!

marcoieni left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

psumbera commented Jun 2, 2025

Uh oh!

rust-bors bot commented Jun 2, 2025

Uh oh!

jieyouxu commented Jun 2, 2025

Uh oh!

rust-bors bot commented Jun 2, 2025

Uh oh!

rust-bors bot commented Jun 2, 2025

Uh oh!

marcoieni commented Jun 3, 2025

Uh oh!

rust-bors bot commented Jun 3, 2025

Uh oh!

rust-bors bot commented Jun 3, 2025

Uh oh!

marcoieni commented Jun 3, 2025

Uh oh!

bors commented Jun 3, 2025

Uh oh!

Uh oh!

psumbera commented Jun 6, 2025

Uh oh!

nikic commented Jun 6, 2025

Uh oh!

Uh oh!

psumbera commented Mar 19, 2025 •

edited by marcoieni

Loading

marcoieni Apr 22, 2025 •

edited

Loading

marcoieni commented Apr 22, 2025 •

edited

Loading